From da699bcabad9b5f9c3f5847318640ee37cf60a81 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 9 Jul 2014 19:46:16 -0400
Subject: [PATCH] app chooser: Move buttons to template

Use the new builder dialog action support.
---
 gtk/gtkappchooserdialog.c                 |  5 -----
 gtk/resources/ui/gtkappchooserdialog.ui   | 19 +++++++++++++++++++
 gtk/resources/ui/gtkappchooserdialog.ui.h |  2 ++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 8074312e6f..485149f249 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -702,11 +702,6 @@ gtk_app_chooser_dialog_init (GtkAppChooserDialog *self)
 
   gtk_widget_init_template (GTK_WIDGET (self));
   gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (self));
-  gtk_dialog_add_buttons (GTK_DIALOG (self),
-                          _("_Cancel"), GTK_RESPONSE_CANCEL,
-                          _("_Select"), GTK_RESPONSE_OK,
-                          NULL);
-  gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (self),
diff --git a/gtk/resources/ui/gtkappchooserdialog.ui b/gtk/resources/ui/gtkappchooserdialog.ui
index b386328f3e..6cf4c36c25 100644
--- a/gtk/resources/ui/gtkappchooserdialog.ui
+++ b/gtk/resources/ui/gtkappchooserdialog.ui
@@ -72,6 +72,25 @@
         </child>
       </object>
     </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="visible">True</property>
+        <property name="use_underline">True</property>
+        <property name="label" translatable="yes">_Cancel</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="ok_button">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">_Select</property>
+        <property name="use_underline">True</property>
+        <property name="can_default">True</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="cancel">cancel_button</action-widget>
+      <action-widget response="ok" default="true">ok_button</action-widget>
+    </action-widgets>
   </template>
   <object class="GtkButton" id="show_more_button">
     <property name="label" translatable="yes">_View All Applications</property>
diff --git a/gtk/resources/ui/gtkappchooserdialog.ui.h b/gtk/resources/ui/gtkappchooserdialog.ui.h
index 7e67c541cd..2a0f7b9d98 100644
--- a/gtk/resources/ui/gtkappchooserdialog.ui.h
+++ b/gtk/resources/ui/gtkappchooserdialog.ui.h
@@ -1,4 +1,6 @@
 N_("Select Application");
 N_("label");
+N_("_Cancel");
+N_("_Select");
 N_("_View All Applications");
 N_("_Find New Applications");
-- 
2.30.2